merge trunk
authorK. Handa <handa@gnu.org>
Sun, 12 Jan 2014 23:26:08 +0000 (08:26 +0900)
committerK. Handa <handa@gnu.org>
Sun, 12 Jan 2014 23:26:08 +0000 (08:26 +0900)
commite298f90e01f95e003a9dd3c9b417f6bd48dc7004
treef25faba72af25882164c15c3416eeb96f862039b
parent9dc3b61441c53f36aaf2e8cdfc925da52d7dcb58
parent9313e43ce36440212e0005b250c643f29a01b071
merge trunk